From dc663438b362c1d3703fea940ad6bb329a7c9b57 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 10 May 2001 20:23:20 +0000 Subject: [PATCH] (smerge-mode): Force font-lock-multiline to t. --- lisp/smerge-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 538ff11519a..5c8af81b492 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier ;; Keywords: merge diff3 cvs conflict -;; Revision: $Id: smerge-mode.el,v 1.11 2001/01/25 15:36:32 monnier Exp $ +;; Revision: $Id: smerge-mode.el,v 1.12 2001/03/07 00:16:29 monnier Exp $ ;; This file is part of GNU Emacs. @@ -466,6 +466,7 @@ The point is moved to the end of the conflict." \\{smerge-mode-map}" nil " SMerge" nil (when font-lock-mode + (set (make-local-variable 'font-lock-multiline) t) (save-excursion (if smerge-mode (font-lock-add-keywords nil smerge-font-lock-keywords 'append) -- 2.30.2